Merge 96bff3bdda1b9fd18fc16f674aed4fcfe0488893 on remote branch

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