Merge "AAPT: Improve debuggability of aapt dump badging errors"