Merge "Use AAPT2" into oc-dev
tree: 8129d2bcf5cb8afe0b91c0e81b3250e400c18db6
  1. apache/
  2. assets/
  3. java/
  4. Android.mk
  5. AndroidManifest.xml
  6. CONTRIBUTING
  7. LICENSE