Merge "vndk: do not use prebuilt ld.config.<ver>.txt"
am: e72308c6b1

Change-Id: I913b42ed9a3ddffb380b1cce0d15ee352824a4c7