Update makefiles after merge of Chromium at bd1cc624f6fd

This commit was generated by merge_from_chromium.py.

Change-Id: I9d01c42d104312dcb7d1062b4ab347c18ca429f3
20 files changed