Update makefiles after merge of Chromium at 268379

This commit was generated by merge_from_chromium.py.

Change-Id: Ie2aa8c2c711a47b9704f072ec8a0761d8eaa34a4
6 files changed