Merge from Chromium at DEPS revision 39.0.2171.44

This commit was generated by merge_to_master.py.

Change-Id: I02f051e689b01973d19895b2b500af1e74b9e9ba