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

This commit was generated by merge_from_chromium.py.

Change-Id: Ieff39dcf549bf443ba65a0f4470176515577de15