Merge from Chromium at DEPS revision 40.0.2214.87

This commit was generated by merge_to_master.py.

Change-Id: I6a8b2e88ece9403ee841196f2f7fd91017710005
22 files changed