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

Change-Id: I7eb3eb0b815bcd0f50722969ea0497c5cd30703b