Merge "Always use versioned VNDK directory"