Back out 49b4afb3ab2f (bug 845134) as the single most unlikely cause of Android build bustage in the history of computing, on a CLOSED TREE