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

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

Change-Id: Ic14b14355be4c44b32512dd1dc19590568a60a05