Merge a625c77e625f190dd01ba812f8f7b5e93b098838 on remote branch

Change-Id: I32ff0f617d518d9ae5d0bb72ceace9ead5bd434f
tree: 9c3282aba450ca6b3a7a9124ca3960e54f478e8d
  1. 1.1/
  2. Android.mk
  3. boot_control.cpp
  4. NOTICE