Bug 848592 - Fix some dynamic rooting analysis failures; r=sfink