Merge tools/grit from https://chromium.googlesource.com/external/grit-i18n.git at 6a46b04d35eade32b1270392317dca516c9dd56d

This commit was generated by merge_from_chromium.py.

Change-Id: I08c9767ca5fb215061b32b9b9a62d5fc5ef85126