Merge from Chromium at DEPS revision 39.0.2171.95

This commit was generated by merge_to_master.py.

Change-Id: I27cfdabe6d9543ab52db6b13ef249c91e49225d9