Update makefiles after merge of Chromium at 234542

This commit was generated by merge_from_chromium.py.

Change-Id: I71c8be7de1acc1ce4c7d9dee9d70d62fa85dfcf4
6 files changed