Merge "Fix JNI misuse during fs-verity setup"