Merge "Actually inject TargetSdkResolver" into rvc-dev