DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I23a72d738bec8a1af5e056733dcead0fb8a8525d
tree: 2d57e9e87d4df17237a91eca2b6b97fe6f7ca0c0
  1. Android.mk
  2. power.c