Merge "Add missing shared lib dependencies."