Merge "Fix a potential thread safety issue in VectorDrawable" into oc-mr1-dev