Update makefiles after merge of Chromium at 253634

This commit was generated by merge_from_chromium.py.

Change-Id: If89ce6a62a515f6da4677e2666516845fd5cae0d
6 files changed