Merge "Make CtsShim targets available to cts shim apex." into rvc-dev