Update makefiles after merge of Chromium at 253634

This commit was generated by merge_from_chromium.py.

Change-Id: I2842e726cba7e6f87c572e954f82c317775a26ed
6 files changed