This for the release that fixes the aapt crash on windows. Change-Id: I4a8e7d672cf03a48763794c4d559130659d5833b