Merge "Load versioned llndk.libraries.txt and vndksp.libraries.txt"