Merge changes Ied58f3ee,I3111e62f

* changes:
  vndk-def: Update eligible-list-master.csv
  vndk-def: Add VNDK_VER suffix to eligible-list-master.csv