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

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