Update makefiles after merge of Chromium at r188769

This commit was generated by merge_from_chromium.py.

Change-Id: I9df38881144d77b9cbef90d28add4d37105ad584
2 files changed