Merge "Prevent AAPT from versioning <animated-selector> tags."