Back out 8a1dfdaaeb3c (bug 1063156) for Android bustage
CLOSED TREE