Merge from Chromium at DEPS revision 39.0.2171.90

This commit was generated by merge_to_master.py.

Change-Id: Ic822d0dcb3576bf60590b10a7e242af23094897d