Update makefiles after merge of Chromium at 5a645aa13b82

This commit was generated by merge_from_chromium.py.

Change-Id: I769ed4b8a29d8594f8ace4d8e7ba04c4e8779d4f
12 files changed