Update makefiles after merge of Chromium at 279716

This commit was generated by merge_from_chromium.py.

Change-Id: I878af00525fd2b08235a57c59454dd44cab6903d
10 files changed