Merge "Remove VNDK version string from intermediate dump paths" into main