DO NOT MERGE

Merge pie-platform-release (PPRL.181105.017, history only) into master

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