Merge 8a3b7981792e5b898115d49681908e23a8366690 on remote branch

Change-Id: I4261b44a60fa0799de7ff674d7dcc468ad657786
tree: bcaa2652b05b8d93afc69643d532c0d9af7504da
  1. 1.1/
  2. 1.2/
  3. Android.mk
  4. boot_control.cpp
  5. NOTICE