Update makefiles after merge of Chromium at 457b0a1c9412

This commit was generated by merge_from_chromium.py.

Change-Id: I94e42c11b5fecef1c1af3fecb5f5293d35568f8c
4 files changed