Bug 939021 - Follow up to fix build tests. r=me