Bug 939021 - Follow up to fix build tests. r=me
Merge pull request #15771 from ferjm/travishotfix

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