[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: 1b22f9e4e4  -s ours

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