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

Change-Id: I7d3985da4891783a24cf6b6bee046bc47011943f