Merge 5284f9b2e31c1a807f8d8035de593f52597e7ea7 on remote branch

Change-Id: I90acbffbe9d30faa4da2b1fdbcb2e0234de2c6da
tree: 2af1701b8601e42409ad2472e68ccbfbd48130af
  1. 1.1/
  2. Android.mk
  3. boot_control.cpp
  4. NOTICE