Update makefiles after merge of Chromium at r189682

This commit was generated by merge_from_chromium.py.

Change-Id: Ib9c346527aa869949d984ede0ba03ccc92543b53
2 files changed