Merge "Reexport vndk for vendor snapshot modules"