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

This commit was generated by merge_from_chromium.py.

Change-Id: I5ff279834b9b4a16e05ba9054b29eaf7ab00c9c9