Merge "Add VNDK version suffix in ld.config.txt on build time."