Merge "Do not append VNDK version if VNDK is not used"