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

Change-Id: I106323cbf711954bf65c9a8ca1dce637571eee14