Update makefiles after merge of Chromium at facf66e09bf8

This commit was generated by merge_from_chromium.py.

Change-Id: Idebb4d45d768674d942fb76b3f0c13339d58192e
2 files changed