Merge "Merge "CtsShimTargetPSdk should build outside APEX too." into rvc-dev am: a16b8b31f8 am: 59c837aeb2" into rvc-d1-dev-plus-aosp am: 5139392acd
Change-Id: I2c3319be7cd8ea6b45af9828bc9e9ea67dcd4cc9
This commit is contained in: