Update makefiles after merge of Chromium at r168517

This commit was generated by merge_from_chromium.py.

Change-Id: Idbf329566cb3fd38cf336a3c5b51e43c287d4379
3 files changed