Fix the aosp remote

Change-Id: I85f01f8465aab43527a6107eacdad5778f30e564