Bug 991067 - Null check mSurface in BasicCanvasLayer to match previous behaviour. r=roc
Bug 904890 - Fix windows build bustage caused by mozzconf/unified builds. r=me