[automerger skipped] DO NOT MERGE am: 1dcb951d11  -s ours
am: 99aec6aaae  -s ours

Change-Id: I4d213e664b44abb6857d1ff5804a0be50d4ee730
tree: c587cdd31c706983a018dad8ee752e0e745ccba7
  1. Android.mk
  2. boot_control.cpp
  3. NOTICE