Back out 090ebbb90a7f (bug 873914) for Android build bustage
CLOSED TREE