Update makefiles after merge of Chromium at r211760

This commit was generated by merge_from_chromium.py.

Change-Id: Ic31892ba10ba1b911bb931debdafe1d1edbf7802
4 files changed