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

Change-Id: Id1fa1e7818361b9c680b593f8f1c5ec32708396c