Merge "Include AAPT2 in windows SDK" into nyc-dev
am: aeeb1265d0

* commit 'aeeb1265d0939b540cd130191ed098fbf785b28c':
  Include AAPT2 in windows SDK

Change-Id: Ia12634c03b4d2f956c5f76f786f639f0bf814d45