Merge 5284f9b2e31c1a807f8d8035de593f52597e7ea7 on remote branch

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