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

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