Merge "Make the connection between implementation and llndk_library explicit" am: 1aba8aec4a am: 11bead39fb am: a59e1fdbad am: c6ed0c9d99

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1466883

Change-Id: I633c5b7517ba5ad0be846b0367de4f8f31774e1f