Merge from Chromium at DEPS revision 39.0.2171.26

This commit was generated by merge_to_master.py.

Change-Id: I90f1e1916435bed20b57f031468b55da8db2092b