Merge Android Pie into master

Bug: 112104996
Change-Id: I529185d80380b948297d3c367cce30b7dec8de54
tree: 61942ca22e03e502cf97b3196f8366efbcf20c1d
  1. Android.mk
  2. boot_control.cpp
  3. NOTICE