Merge from Chromium at DEPS revision 37.0.2062.117

This commit was generated by merge_to_master.py.

Change-Id: I10f91bf236e7e728efcb594a6a51621516f6f273
6 files changed