Merge fa259f46c2ce1f9ec0030c1f815440cf173a718e on remote branch

Change-Id: I2b2cd81078750943e22615455e762b499712a201
tree: 174ad4da101137b223d3858d3a0f34c006e9d57a
  1. 1.1/
  2. 1.2/
  3. Android.mk
  4. boot_control.cpp
  5. NOTICE