Merge "Revert "adapt ld.config.txt for vndk apex""
am: 055ded38f4

Change-Id: Ib9974bdc1576d3b51b020fca148a85fc0d6bf353