Update makefiles after merge of Chromium at 258872

This commit was generated by merge_from_chromium.py.

Change-Id: I1b5829bd826d15ebbebab10abad6da234d5c22da
2 files changed