Merge "Make the connection between implementation and llndk_library explicit" am: b527e66392 am: 656f97cf61 am: 561f665302 am: 0ccd8da894

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1466034

Change-Id: I9c2f41bf53ea138b3f92ac63a19ec965edc46b22