Backed out changeset 9ab60c44a510 (bug 832052) for breaking android 2.2 debug builds