Update makefiles after merge of Chromium at b62471bd5180

This commit was generated by merge_from_chromium.py.

Change-Id: I34739eb041976d8d3e0bc2579531109faa1e5ee6
10 files changed