Update makefiles after merge of Chromium at r166198

This commit was generated by merge-from-chromium.py.

Change-Id: I22e64687c9fae437ebeabc938b79d61d9cbf0b3e
3 files changed