Update makefiles after merge of Chromium at 278187

This commit was generated by merge_from_chromium.py.

Change-Id: I6d35e6e1f268064de5a4c0764ceb54753b73e4a2
20 files changed