Merge from Chromium at DEPS revision 39.0.2171.59

This commit was generated by merge_to_master.py.

Change-Id: I5f8309144020941ddd0d4533e8595caec8df626b
14 files changed