Bug 828126 - Remove ANDROID special-casing now that dependent bugs have been fixed. r=avih