Backed out changeset 3629ea724086 (bug 1089159) for android 2.3 build failures