Update makefiles after merge of Chromium at 9c6ac85c45fa

This commit was generated by merge_from_chromium.py.

Change-Id: I8e3723b859615769ffe94f881caa06e4ebb34f84
10 files changed