Merge from Chromium at DEPS revision 39.0.2171.95

This commit was generated by merge_to_master.py.

Change-Id: I6552f50efcb5b59fcee215d969e4248b7c81d6d1