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

This commit was generated by merge_from_chromium.py.

Change-Id: I415df72e3cf013f5f19ff4603c4dc8f428c30790