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

Change-Id: Idecdf833afb166f8841337d939837a0bf80ef163