Bug 1015576 - fixing performance regression on android. r=mrbkap