Merge "Load versioned llndk.libraries.txt and vndksp.libraries.txt" am: 43e063f027
am: 0032237c93

Change-Id: Ifa764925207dffaf9410b025459e2d4126cbc7e3