Merge "Prevent AAPT2 from versioning <set> tags"