DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Ie01efa764e3716aab34267b8d36209c3301b71fc
tree: c4c317726ecdff16d5039bb7701c4f652fa05cb0
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml