Merge "Use llndk.libraries.txt from system if VNDK is deprecated" into main am: b2d6cc2e41 am: 95c85d27bb

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2703694

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