Update makefiles after merge of Chromium at 245428

This commit was generated by merge_from_chromium.py.

Change-Id: Ied5789dc32a33339419d1469dcad157472dc860d
6 files changed