Update makefiles after merge of Chromium at 89b463ddd92b

This commit was generated by merge_from_chromium.py.

Change-Id: Ie00e1b8610c67379fcdc5d3bfd3200ba0d05752f
10 files changed