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

Change-Id: Id4e165610e03ca7b8f0bc9aca781382f48f2cd1c