Merge 6cb2be4a02805ed2acf5695369ca4d355abb5a48 on remote branch

Change-Id: I91aefeae7889e870965839db87c3c6fda1c241f2
tree: 666cd628c33ddfbb625b73ca4dbf0b8ab3946e48
  1. 1.1/
  2. Android.mk
  3. boot_control.cpp
  4. NOTICE