Merge "Add VNDK version suffix in ld.config.txt on build time." am: 447280cea0
am: 3060be356f

Change-Id: I60f8d5752449577c7806e73e94331c62d6d5f91e