Update makefiles after merge of Chromium at 231906

This commit was generated by merge_from_chromium.py.

Change-Id: I78e9e80179d71565b34b6acf199b75c9d82893f7
6 files changed