Update makefiles after merge of Chromium at 22dda5d590f8

This commit was generated by merge_from_chromium.py.

Change-Id: I392a5f027fe88f2d06437a5104c14b21f82f7836
20 files changed