mondrianwifi: And back to QCOM power HAL again

Change-Id: Ie19a88ef9b3f00cd437cc5560630ef6fb5cfd6ad
Merge branch 'cm' into HEAD