Update makefiles after merge of Chromium at d7fee8e7dd15

This commit was generated by merge_from_chromium.py.

Change-Id: I23f1c4e469e9a406880ff05cb3d03dd22a9b0dd3
2 files changed