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

Change-Id: I66b869b8e1cc90bc2c139cf07956ac5dd7940d08