Merge "Make the connection between implementation and llndk_library explicit" am: 3e7b21c1b6 am: 2cbc12ba3e am: e0f4fce861

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1465666

Change-Id: I5c2f92f297d82da9528477cc132cfbe0b4159369