Update makefiles after merge of Chromium at 89b463ddd92b

This commit was generated by merge_from_chromium.py.

Change-Id: I9252b44f242eeb73b109253a8e989cde7db63ed0
10 files changed