Merge a97dc7ae194296f3ecaed5060b0b60373535074a on remote branch

Change-Id: I9f176b5db83ba05cef5e36db5460fa14372dafa2
tree: 06afa1ec63c59a7f80ea4ba7b9b0da8514699053
  1. 1.1/
  2. 1.2/
  3. Android.mk
  4. boot_control.cpp
  5. NOTICE