Merge "Add Matterhorn CPU lib" into integration