Merge from Chromium at DEPS revision 39.0.2171.95

This commit was generated by merge_to_master.py.

Change-Id: Ie6eeccba617d1fe3d008f781a50fb5a951a57559