Merge "Don't try to group static libraries on mac." into jb-mr2-dev