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

Change-Id: I449d444da0f6b9521e4f252ff354ecf7d6c8aa52
tree: 8b3f6c35106d79e94827c391f62ad7e38e826ff9
  1. Android.mk
  2. boot_control.cpp
  3. NOTICE