Update makefiles after merge of Chromium at facf66e09bf8

This commit was generated by merge_from_chromium.py.

Change-Id: Iac640a9f0425376b027703fae33afa860e059d45
2 files changed