Fix the AOSP remote