merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
tree: 6d32b7edf7f2324490d8d4bf759a65b65a4c74fa
  1. Android.mk
  2. power.c