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