Merge "Do not append VNDK version if VNDK is not used"
am: 4d281880e0

Change-Id: Icdabede4ffa6a963b79460358266ae0c230d6fc1