Update makefiles after merge of Chromium at 245428

This commit was generated by merge_from_chromium.py.

Change-Id: Idb7dea2da209fb7211cc6389f5bd09a073ae7e7d
6 files changed