Merge "adapt ld.config.txt for vndk apex" am: 5b388b5905
am: 07bd8e7740

Change-Id: I14959ba0e2c76e83bb69d4bf64bc05494fef3540