Update makefiles after merge of Chromium at 37.0.2062.21

This commit was generated by merge_from_chromium.py.

Change-Id: I588e888b5720cec8aa851100c6f2e4076b38ec59
12 files changed