Merge "Build support libs with AAPT2" into nyc-dev am: 920dacf
am: 39a7c45

* commit '39a7c45711cdab27a250e45e23bdf13b2d4e95cd':
  Build support libs with AAPT2

Change-Id: I223391282c7e87c25f0e329b9c08737c94a56288