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

Change-Id: I246264682f84fcf61fe7b58fb505a930ef76572b