Merge pi-dr1-dev to aosp-master am: a5df18f6a0 am: 1275b15136
am: b7a6ef5292

Change-Id: I759b48343aec7d0b39cbe3ce8e288b69cef8b7a2
tree: c587cdd31c706983a018dad8ee752e0e745ccba7
  1. Android.mk
  2. boot_control.cpp
  3. NOTICE