Merge "Define llndk modules instead of vndk_package" into main am: a8c405f2

Original change: https://android-review.googlesource.com/c/platform/build/+/2756025



Change-Id: Id0236f9d3f936532f9cf6d71f2630b85cd0450e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>