Back out a90fac2a088b:759555fe9d38 (bug 760642) for Android/b2g build bustage
CLOSED TREE