revert "fixing duplicate androideabi"