Update makefiles after merge of Chromium at 238989

This commit was generated by merge_from_chromium.py.

Change-Id: I5b29315d9de4aa80d7ee93b7ed410d8714c7eb76
6 files changed