Update makefiles after merge of Chromium at 233627

This commit was generated by merge_from_chromium.py.

Change-Id: I03b2139d9c825449c0bed183150b9cce903b66b2
18 files changed