Merge from Chromium at DEPS revision 39.0.2171.95

This commit was generated by merge_to_master.py.

Change-Id: Ie9ff76cd7eeede8f700c014795c45dfc734ab144