Reconcile with jb-mr2-release - do not merge

Change-Id: I36692fa520d12fc097f25b185c71b17d2febecb7
tree: 0cb996b63abcfe07120bd3e6f3cc9977115b69a4
  1. Android.mk
  2. power.c