Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev