backout e88f7f550c2b (Bug 859391) for Android bustage CLOSED TREE r=bustage