Merge "Do not use versioned VNDK directory in vendor partition"