Manually merge changes from giant AOSP topic

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