DO NOT MERGE

Merge pie-platform-release (PPRL.181205.001, history only) into master

Bug: 120502534
Change-Id: Iec99918a1616f31d77db7f47cc18fa7c5abbf068
tree: 2d57e9e87d4df17237a91eca2b6b97fe6f7ca0c0
  1. Android.mk
  2. power.c