Merge "Strip version info when extracting symbols"