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

Change-Id: Idbcf3a51211a87574bd4aff8d01fb49e504b3981