Update makefiles after merge of Chromium at 457b0a1c9412

This commit was generated by merge_from_chromium.py.

Change-Id: Ie1701f7ea4c871632674cfc284e1cf8973c3ab7c
2 files changed