Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: Ic281cecdd11964b0e7849fb477a5f470958ada79
tree: e75fa9f01df739108988e4b16bdc4ba4526a72cf
  1. Android.mk
  2. power.c