Merge "Update so/libs submodule to head of master branch"