Fixup aosp remote