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

Change-Id: I668429a66b5046dd0c968ea1442da9c2500dcf94