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

Merge "Define llndk modules instead of vndk_package" into main am: a8c405f2 am: 4345d8fd am: c8571790 am: 798c03e5

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



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