Update makefiles after merge of Chromium at r220988

This commit was generated by merge_from_chromium.py.

Change-Id: If52d693f492fa70691744b8df81cb67f1cb03b23
12 files changed