Backed out changeset cc45fdc389df (Bug 779291) for breaking Mac Android builds.