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

This reverts commit 4506f5e6b5a81aca5109f61dbd9db891479a7f7b.