Merge "Override tethering module APK-in-APEX for Go variant" into rvc-dev