Merge "Build aapt2 statically on windows" into qt-dev am: 274a7b2975
am: a5cfb6cf9a

Change-Id: I7510532badd2ea61232d3ff16912f767e331c307