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

This commit was generated by merge_from_chromium.py.

Change-Id: I570d51d0b20555c713bcbd16970dc25be1d355f3