Move android toolchain overrides to the proper place