Merge "Add extra logging for AaptParser"