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

Change-Id: If9f28bfe12d75fca6b8f07c15b77f78267ef6292