Update makefiles after merge of Chromium at 82ca3b654cda

This commit was generated by merge_from_chromium.py.

Change-Id: I8b1f5cabd2bf8c2b0114d18c52cf46622d816ffc
14 files changed