Experiment: Change back to the old Android toolchain for one commit

To see if 2.2 devices are happier.