Merge "Add package-verifier to aapt dump badging"