Update makefiles after merge of Chromium at 37.0.2062.52

This commit was generated by merge_from_chromium.py.

Change-Id: I6b7475bf1f9c487fa6e03a26fac0a25bd633d0d6
20 files changed