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

Change-Id: I4039d451c18b77ad3c8eafadaa9cb2eba7558caa