Merge from Chromium at DEPS revision 40.0.2214.38

This commit was generated by merge_to_master.py.

Change-Id: I6ec6ba68fb305e56852e013f61405e5fc8e06393
17 files changed