Update makefiles after merge of Chromium at 256368

This commit was generated by merge_from_chromium.py.

Change-Id: Iefd4afa427efbe6ff509435510f716a1c76797c9
2 files changed