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

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