Disable -Wthread-safety-negative
am: 62f62f38f4

Change-Id: I5c47e1bad6594e2fd7f5500d0ae19854d43e9118