Merge "Revert "adapt ld.config.txt for vndk apex""