DO NOT MERGE: Merge Oreo MR1 into master
am: bb80b0f386  -s ours

Change-Id: I34afb9bd06de67c716e49100c912c8f3d43c9cff
tree: 11e056bb3d72d766f16136e04a48afd77c52bf59
  1. Android.mk
  2. boot_control.cpp
  3. NOTICE