Merge pi-dr1-dev to aosp-master
am: a5df18f6a0

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