Merge "Revert "Build Support7Demos with AAPT2"" into nyc-dev
am: 27d0c3e

* commit '27d0c3e484a2379b27b7bc3c561fc8320e8d9afc':
  Revert "Build Support7Demos with AAPT2"

Change-Id: I956a77e0e2431393f2e5b8b21f6eaa166ea5d81b