Merge "Don't leak libc++ symbols across modules"