Update makefiles after merge of Chromium at facf66e09bf8

This commit was generated by merge_from_chromium.py.

Change-Id: I1364857f3bfbfccbf9a3104a52cb502e0e7eb45e
4 files changed