Merge "Always use versioned VNDK directory" am: dda4678a11
am: 3abbb4cb00

Change-Id: Ifa93610f944f66ef510790266b8a210562bbbd7d