Revert "Fix toolchains android-ndk-r9"

This reverts commit cabc0e24244a9a658063a9794b02219981fb652b.