Merge from Chromium at DEPS revision 39.0.2171.95

This commit was generated by merge_to_master.py.

Change-Id: Id2fe4a06123cc0a60c02fbaa68f07ce2f56c96ba