Update makefiles after merge of Chromium at 253112

This commit was generated by merge_from_chromium.py.

Change-Id: I0b36c1e14bdc1750350163970ad4c8ae2fb05d82
6 files changed