Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
am: ab36b830e9

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