Update makefiles after merge of Chromium at 289578

This commit was generated by merge_from_chromium.py.

Change-Id: I6b9ef3d9f9d06c0b9062e0dddede5f8ec20aac6a
10 files changed