Back out 8e1d913c4436:c39721a052f3 (bug 948241) for Android build bustage
CLOSED TREE