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

Change-Id: I2e49a8f4e41f3f0c0c0e138ea1a7243aad6f3e9a
tree: 0131de5d8d8d5ef2c6882ca7aa2e9952d5b26d55
  1. Android.bp
  2. Android.mk
  3. boot_control.cpp
  4. NOTICE