Update makefiles after merge of Chromium at 457b0a1c9412

This commit was generated by merge_from_chromium.py.

Change-Id: I6d20c8317d1906b6317df5436fa4cbb7790f6b23
2 files changed