Update makefiles after merge of Chromium at a99b7ad25d02

This commit was generated by merge_from_chromium.py.

Change-Id: I50b9244bcce865fadd6a0df93c911cf163c9c40f
10 files changed