Merge "Build a JVM-compatible version of libnativehelper" into main