Update makefiles after merge of Chromium at 247409

This commit was generated by merge_from_chromium.py.

Change-Id: Ifad6fb90f78a8efa96c93ceb89ae8419daee57f4
6 files changed