Merge "Animated vector drawable support" into nyc-dev