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

Change-Id: I4b6c5e8472a023fff879b7df34e2866462032c0c