Merge from Chromium at DEPS revision 39.0.2171.59

This commit was generated by merge_to_master.py.

Change-Id: Icc82dfd5fe6115ae33a4895c0a56147ef871e4bd