Update makefiles after merge of Chromium at 40aea5fe9465

This commit was generated by merge_from_chromium.py.

Change-Id: I879b4f4c03846d30833cb2167911465788dcc8c7
20 files changed