Merge "AAPT dump badging should allow refs in meta-data"