power: Fix arm64 build

Change-Id: Icd3708c4fb12beb5925e401fd3b4a271567e523e
Merge remote-tracking branch 'cm/cm-12.0' into HEAD