Merge from Chromium at DEPS revision 39.0.2171.95

This commit was generated by merge_to_master.py.

Change-Id: Ie8322cf9b80cce0537ab2f0dda42eb304fe28f87