Merge "Revert "Build support libs with AAPT2"" into nyc-dev am: bba7804
am: 5a935f2

* commit '5a935f2648849d290ebc23ac6010639900ae4109':
  Revert "Build support libs with AAPT2"

Change-Id: I508677e189a2d742b7348b3d8cd66da138fc508c