Merge "Disable to build ld.config.txt with previous vndk version" am: 59a9cef6a0 am: c467e46c4d
am: 9d81a04343

Change-Id: Idd177f69a04fd7f13291c7545d3a53f4d9ec182d