power: Deal with TARGET_POWERHAL_VARIANT

Change-Id: I7d68066b17ce54866ae354669a7b05029d7b12f7
Merge remote-tracking branch 'cm/cm-11.0' into HEAD