Removing upstream flag as it is now the default. Also moving to internal robolectric projects to no longer use the _upstream suffix. Test: CI Bug: 386652866 Change-Id: If210e213cf2e34ff94c4e0f34cc21cd1d00a2337