backout 7d60232a5232
backout 481ee3f37229
avoid android 2.3 xpcshell failure