Merge "Do not use versioned VNDK directory in vendor partition"
am: 3459e5823e

Change-Id: I71264e329c01771a694999c710cdc41f4db69b7b