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