Update makefiles after merge of Chromium at 6a4d455b8650

This commit was generated by merge_from_chromium.py.

Change-Id: I08e162f2356523f4c657f3406deb3c4b01d9350d
10 files changed