Merge \"Fix use-after-free in vector drawable animation\" into nyc-mr1-dev
am: 133ab10464

Change-Id: Ice990efd5e8a2554c8a57b191e4d288971270919