Merge \"Fix TintContextWrapper not always handling vector assets DO NOT MERGE ANYWHERE\" into nyc-dev
am: 1e87f4ec3f  -s ours

Change-Id: I148e663d52a44f208ff795dcc9ab113a619e86e7