Merge stage-dr1-aosp-master into stage-aosp-master am: 08a2b850a5
am: e9d83e38d0

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