Merge "jni tests: set min_sdk_version=33" into main