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

Change-Id: I8a61a3b050222ddb560c01cc94243f08abf1745b
tree: 8b3f6c35106d79e94827c391f62ad7e38e826ff9
  1. Android.mk
  2. boot_control.cpp
  3. NOTICE