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

Change-Id: I6684ea4e1d1f2e44059da8ea3b3cec7b82987bff