Backout 8a4946c07c92 (bug 922145) for Android bustage on a CLOSED TREE