Merge "Add corkscrew support for finding static symbols."