Merge "adb: enable -Wthread-safety on linux/darwin." am: 2983d2710e
am: 0c91897714

Change-Id: I8d08f4bd3533942533e8e070ae0d6439bd1eb622