Merge 10952656

Merged-In: I1203be9f04301db17050b860e06185e40d9b58d7
Change-Id: Ia4cd719b06519442e997bee06c2aee48124c58fb
tree: 0840ac625a1f3e3be6548609bc12215e98f303e6
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS