DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

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