Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1