Update makefiles after merge of Chromium at 82ca3b654cda

This commit was generated by merge_from_chromium.py.

Change-Id: I9db31eab580a77442d38de1a64c9652e173b3862
10 files changed