Update makefiles after merge of Chromium at b241671f0248

This commit was generated by merge_from_chromium.py.

Change-Id: Ibf139c6f0ca023537cf1ef8c1b5418564da06ddc
2 files changed