Merge "Use llndk.libraries.txt from system if VNDK is deprecated" into main