Merge stage-aosp-master into pi-dev-plus-aosp

Bug: 126125118
Change-Id: Ibe1e43941c3e090c084d4733ef172b83f6fe8dfd
tree: 677dc496b7ae950e7aa60a5d37f02337b4741b2d
  1. Android.mk
  2. boot_control.cpp
  3. NOTICE