bug 837461 - backout parts 2 and 3 of bug 808288 because pdf.js may paint missing chars to canvas if it failed to load fonts, which looks really ugly; better to skip them for now. r=bas
Bug 834716 - Fix bustage; r=me
Merge m-c to inbound.