Backed out changeset 96a5b2854978 (bug 527444) for android xpcshell bustage on a CLOSED TREE