backout 703d26e9d979 (Bug 1024084) for Android bustage, on a CLOSED TREE