Backed out changeset 9f013d802a78 (bug 1091992) for Android m5 test failures