Merge "Use AAPT2" into oc-dev
am: d3b7539c1c

Change-Id: I68778239c83215507b9195489cdf2c40cea6095b
tree: 798497aef1cacec3c47254b002eaf9f1adf31a68
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml