Backed out changesets d3352d36dbdf and e74b6a1da573 (bug 978120) and changeset 816c209eaa71 (bug 978528) for Android xpcshell failures.