Merge from Chromium at DEPS revision 39.0.2171.95

This commit was generated by merge_to_master.py.

Change-Id: Ic6d24dc5ca8f6dc08cbceb7f06e8365e3cc509ad