Merge "adapt ld.config.txt for vndk apex"
am: 5b388b5905

Change-Id: Id644648e8092bb1027f24ad4a0bfa29210f2078b