Merge from Chromium at DEPS revision 39.0.2171.53

This commit was generated by merge_to_master.py.

Change-Id: I3d59227b50cc46297049b25b77f1661f89257f89
28 files changed