Revert "also track AOSP androideabi 4.6"

This reverts commit cb97b53558ef63ce43361174d75f4e9e639e2bf7.