Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

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