Backed out changesets 58db1fb509be and 7301ccf7e0be (bug 947391) for Android xpcshell orange.