Update makefiles after merge of Chromium at 256368

This commit was generated by merge_from_chromium.py.

Change-Id: I213907fe92dea141bae5d149141dcaf72c5a5428
2 files changed