Bug 1028734 - Unbreak --disable-ion build after bug 1019304. r=shu
Bug 1028775 - Unbreak non-unified build of --disable-ion after bug 1013326. r=luke