Pull in fix for aapt dump issue