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

Change-Id: Ib19db37bdb6d030806f42ac9ecbeb88f71007456