Merge from Chromium at DEPS revision r213371

This commit was generated by merge_to_master.py.

Change-Id: Ia325e87db5e8f331df22e447d0bdf6dfd08dbb40