Merge 07201315dd1e895d9726197110644bd7b987c37a on remote branch

Change-Id: If66d37025d892288e7242af986ae601c27514bb1
tree: 9536bb94fa8833be3f5406f810e2570c36ae55f6
  1. 1.1/
  2. Android.mk
  3. boot_control.cpp
  4. NOTICE