Bug 824473 - Fix build errors (r=bustage)