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

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