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

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

Change-Id: I9c4e659cf8c47d63d808079c4bffad77b9764b4b