Merge from Chromium at DEPS revision 39.0.2171.26

This commit was generated by merge_to_master.py.

Change-Id: I83a9ea2e679f5db9547d1bbd0bc23b8ca9a47b7a