Merge "Static libc++ is being renamed libc++_static."