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

This commit was generated by merge_from_chromium.py.

Change-Id: Ic5fd3918ce328921e6b26a33de1f53b63c9e611e