Revert "Revert "Track SM 4.8/4.9 androideabi Toolchains""

This reverts commit 50e1a9609d0bb802feaa0164876e81e6b935061f.