Merge "Fix use-after-free in vector drawable animation" into nyc-mr1-dev