Merge "Add a missing dependency on a shared JNI library" into lmp-dev