am fd21f082: am bbc5508d: Merge "Add a missing dependency on a shared JNI library" into lmp-dev

* commit 'fd21f082dfa00d2e8336a7ff7194944e700a26ef':
  Add a missing dependency on a shared JNI library