Bug 836654 - Part 11: Follow-up for b2g18; fix compile errors. r/a=me