Update makefiles after merge of Chromium at b62471bd5180

This commit was generated by merge_from_chromium.py.

Change-Id: I8f53cb8a0b9c4c6e5cccaa3a142a8511393b383c
12 files changed