Update makefiles after merge of Chromium at b241671f0248

This commit was generated by merge_from_chromium.py.

Change-Id: I3a473c074834132b47e4ddb192082e73966a6f8c
2 files changed