envsetup: aospremote: Take .gitupstream into account

Adapt function for .gitupstream so we always get the correct
remote without needing to calculate the path manually.

Test: Run `aospremote` in `kernel/configs` repository.
Change-Id: Idcac37ded4a5b2d62d26dc01dd7d68039def6220