Manually merge changes from giant AOSP topic

Change-Id: Id65f97188d1283a7ac745fefa3efd768fa9489f4
tree: a175d19a67ecc3126636a1af0fb6efef97687e32
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. OWNERS
  6. proguard.flags