Merge "Build Support7Demos with AAPT2" into nyc-dev
am: ae16f56

* commit 'ae16f5692f2a6b28f44eca7aef8425dddf034629':
  Build Support7Demos with AAPT2

Change-Id: Ic1145e38551fc60490b7eaccea7bf1af63d181c4