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

Change-Id: Ie3d7cdf1051ac64200f59eb1f819d543c36c71e4