tree b991983d261293752c1a8c4846b8f80b3ace8559
parent 764cf04a13958d72db5a22eb4bbb9370e00777f5
author Mark D. Roth <roth@google.com> 1504281737 -0700
committer Mark D. Roth <roth@google.com> 1504281737 -0700

Fix asan and tsan failures.