Merge \\"init.hikey.rc: remove permission setting on /dev/cpuctl\\" am: f914ccd828
am: bd2a7dc6cc

Change-Id: I30239f55c5ace8ac9da1e7b65acc295512c062bc