Bug 1068613 - Addendum: Fix bustage in ASAN builds. r=bustage on a CLOSED TREE