Merge stage-dr1-aosp-master into stage-aosp-master

Bug: 112535855
Change-Id: I080ba52b88eaef2698595f8256d1b60df21cdb95
tree: 8b3f6c35106d79e94827c391f62ad7e38e826ff9
  1. Android.mk
  2. boot_control.cpp
  3. NOTICE