Update makefiles after merge of Chromium at 271215

This commit was generated by merge_from_chromium.py.

Change-Id: Ieed7eba8054c911c9364db9566add72bd64c20e3
4 files changed