Merge "Fix errors caught by aapt2"
tree: 1a22cb763cfdfd3f179cfeef41b2433d81b884f0
  1. Android.mk
  2. AndroidManifest.xml
  3. OWNERS
  4. res/
  5. src/