Merge "Build: Skip JNI lib symlink in second-stage build"