Merge commit 'd794cadaa862d4074e9a2778e92acf7b3dd02515' into HEAD

Change-Id: I6e78a6f7565ce0bf703833988fc602dd47cec3e5
tree: 11e056bb3d72d766f16136e04a48afd77c52bf59
  1. Android.mk
  2. boot_control.cpp
  3. NOTICE