Merge "AAPT: Dump uses-feature version in dump badging" into nyc-dev