Merge c94d11a34ecb2da9ea9916288e105a0dcb4d1acf on remote branch

Change-Id: Ia23ec029f5d7d1bd03c1803d3b9b3909bc5b68d0
tree: 513de81350cca9d8840199362da816dcee5791f4
  1. Android.mk
  2. boot_control.cpp
  3. NOTICE