Merge "CtsShimTargetPSdk should build outside APEX too." into rvc-dev