Bug 906790 follow-up: Unbreak ASAN builds