Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: d771283051

Change-Id: I2ca81fd737aad7d2466355f918246774e8c703f1
tree: 61942ca22e03e502cf97b3196f8366efbcf20c1d
  1. Android.mk
  2. boot_control.cpp
  3. NOTICE