DO NOT MERGE: Merge Oreo MR1 into master am: 4774dc09fd  -s ours
am: 8a9f33b8a7

Change-Id: I6094090377475869d6af43106d377eba92e253a3
tree: 532ff1842f9315b1e2c149f68ac9d5c5ad8a486e
  1. oem_template/
  2. src/
  3. testing/
  4. Android.mk
  5. proguard.cfg
  6. README