Update makefiles after merge of Chromium at 284435c33e33

This commit was generated by merge_from_chromium.py.

Change-Id: I78185600a6e5a2a23f6def7cca54b063958e9206
20 files changed