Set aosp upstream properly