Switch to using upstream

Now when android patches are upstream, use upstream.
Look at the right part of argv