Merge "Fix using libc++_static in dynamic binaries."