Merge "Make the connection between implementation and llndk_library explicit" am: ebd91fc559 am: 631cfd769e am: ef3de0791c

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1466513

Change-Id: I7d4131903c8a9a71c727d5b20aa7fa5be9a1b012