Merge from Chromium at DEPS revision 38.0.2125.83

This commit was generated by merge_to_master.py.

Change-Id: I4ebcc39b596b296431dfe330c5c44f6ba3eba916