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

Change-Id: I90e184eeaaf41e6cbd35efbef6b8ba26ae13be1d
tree: e17d635ab6ccade4ec16dd41909e98d39194077d
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags