Merge from Chromium at DEPS revision 40.0.2214.10

This commit was generated by merge_to_master.py.

Change-Id: I1df6ee2e582be08580a20291e1a0b1c2c94ab24b
34 files changed