Update makefiles after merge of Chromium at 288938

This commit was generated by merge_from_chromium.py.

Change-Id: I05d63e40021e2652dfb5c0553c5ab2916db514e3
12 files changed