Update makefiles after merge of Chromium at facf66e09bf8

This commit was generated by merge_from_chromium.py.

Change-Id: I3207699a55bc2ee055d4a31aabd92f6bd70a3ab6
2 files changed