Update makefiles after merge of Chromium at 245421

This commit was generated by merge_from_chromium.py.

Change-Id: I85657df8f86a043a80a83a37d6f2f40235ae0b62
6 files changed