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

Change-Id: I5f018d3d1cb8ce27b629acc7fc96738b46c837ba