Update makefiles after merge of Chromium at 6a4d455b8650

This commit was generated by merge_from_chromium.py.

Change-Id: I536a12d95da784b7c28e915cd7830a42f45334f9
10 files changed