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

* commit '2ace3b01ab9447ce9fda2f578e31c1c11f4837cb':
  Merge "AAPT fix printf %zd crash on Windows". Do not merge.