Bug 861715, birch and cypress fixups for b2g workweek, r=rail