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

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