Update makefiles after merge of Chromium at b241671f0248

This commit was generated by merge_from_chromium.py.

Change-Id: I587d92dfab68d926e9a51cda3202e05295929980
2 files changed