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

This commit was generated by merge_from_chromium.py.

Change-Id: I05db772686c6119eae9952a2e0c668b0fac1e68f