Update makefiles after merge of Chromium at 2d0da5605d75

This commit was generated by merge_from_chromium.py.

Change-Id: Idf33618d369728ffd0e5bd96eef41d5a08e11bcf
2 files changed