Add strongarm and update sr_core