Bug 811779 - Fix build bustage from 885f829b692b, r=bustage, a=NPOTB,test-only