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

This commit was generated by merge_from_chromium.py.

Change-Id: I32a7f9e6fe92c87820a7db986575a0c12300131b