Update makefiles after merge of Chromium at 82ca3b654cda

This commit was generated by merge_from_chromium.py.

Change-Id: I164360f1eea98e19e7ea30ae5a1a43a97641a61a
10 files changed