Update makefiles after merge of Chromium at facf66e09bf8

This commit was generated by merge_from_chromium.py.

Change-Id: I63adf652bf545222f47b4ba10d8707aaa96317e2
2 files changed