Merge from Chromium at DEPS revision 38.0.2125.80

This commit was generated by merge_to_master.py.

Change-Id: I5138e31d4e93f50537542dc0cafe1a069228ce55