Merge "Revert "Change linker config variable: VNDK_VER""
am: 919dc05d66

Change-Id: Ib2a7d3aba78f62ce02d1d4e13c636d4554e7de88