Update makefiles after merge of Chromium at 82ca3b654cda

This commit was generated by merge_from_chromium.py.

Change-Id: I1914afc3bbfacffb966e41b8e591cafc0fcfc790
10 files changed