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

* commit 'aeeb1265d0939b540cd130191ed098fbf785b28c':
  Include AAPT2 in windows SDK

Change-Id: I9fe3f312d3413186800bc12880137eca3ffb4e1a