Merge "Prevent AAPT from versioning <animated-selector> tags." into oc-mr1-dev