Update makefiles after merge of Chromium at 253112

This commit was generated by merge_from_chromium.py.

Change-Id: I82e5d6ef97555aea1982d30ed0d57ed2e65d5d9a
6 files changed