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

Change-Id: I4493f92bf877d9a792837df5c062570f972a6901