Backed out changeset 2ccde1bdcb7f (bug 902686) for android m3 test failures