Fix aosp remote