Merge from Chromium at DEPS revision 40.0.2214.45

This commit was generated by merge_to_master.py.

Change-Id: I787e1549d9339a8b8aea25eca14d781d65ffbf84
12 files changed