Update makefiles after merge of Chromium at 231849

This commit was generated by merge_from_chromium.py.

Change-Id: I8d0e9dd87d680c314bb1296fd9ec86c0e2b9568b
6 files changed