Update makefiles after merge of Chromium at 9c6ac85c45fa

This commit was generated by merge_from_chromium.py.

Change-Id: Ia7c6ef0b0c28d9f3de48793cb045a3c02f35a231
12 files changed