Bug 885023 - Follow-up to fix build bustage on Metro. r=me