Update makefiles after merge of Chromium at 5a645aa13b82

This commit was generated by merge_from_chromium.py.

Change-Id: Ieea0759d46f154d382faf88ec20a7e7eb538a07b
16 files changed