[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: a2f15dbbe4  -s ours am: 17d5a65498  -s ours
am: 1eda65621f  -s ours

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