Merge from Chromium at DEPS revision 40.0.2214.87

This commit was generated by merge_to_master.py.

Change-Id: I0b70505528e1d8edd49f779d849a2be616596b60