Merge "Remove overlapping static and dynamic libraries"