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

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