Merge "Build support libs with AAPT2" into nyc-dev am: cb461c1
am: 3ed683d

* commit '3ed683d263dbad5f9a46515f0416198208c8814a':
  Build support libs with AAPT2

Change-Id: I27ade61a0732410ff242868b8d167d7eeb69277c