Merge from Chromium at DEPS revision r213371

This commit was generated by merge_to_master.py.

Change-Id: I57aad68451cfc7ae0b02504b091c4fa5e89cf170