Fix the aosp remote