Merge 6cfe4159e2cf270f78e8160c9dbfe411e790ac03 on remote branch

Change-Id: I83a57b2bde7a5aa5841e3b29160cd520fdd450af
tree: 10b47060ea2764f9c7121a0dd40d6818713ae68c
  1. 1.1/
  2. Android.mk
  3. boot_control.cpp
  4. NOTICE