Merge "Revert "Build Support7Demos with AAPT2"" into nyc-dev