Add some newer AOSP/master toolchains.