Back out f59bb340e3e6 (bug 826481) for Android build bustage
CLOSED TREE