Merge "Improve checking in aapt dump"