backout c7e523e3d339 (bug 1083373 part 2) for Android debug build warning, treated as error