Merge 51905b4794b21471cf74bd578256e856134478b8 on remote branch

Change-Id: If0d85014bbc6e8c8bb84456909b3f2375df05298
tree: 88e8c12c2a2bf0e73e40352db4ecb9dc5433f593
  1. 1.1/
  2. 1.2/
  3. Android.mk
  4. boot_control.cpp
  5. NOTICE