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

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

Change-Id: I38d5e4269c690a221962145e45101141d73871ee