fix aosp remote