Update makefiles after merge of Chromium at r220875

This commit was generated by merge_from_chromium.py.

Change-Id: Ieff363ca3ba5dc7552578093fa47b206b4ce7b19
6 files changed