Update makefiles after merge of Chromium at 257433

This commit was generated by merge_from_chromium.py.

Change-Id: I8475f3adc6544278780c9c80b2e1b914f7664e44
6 files changed