Update makefiles after merge of Chromium at d0b993bb2548

This commit was generated by merge_from_chromium.py.

Change-Id: I04085ab6ad987ab02e6b7d54c4806358a229a625
10 files changed