Merge "adb: make darwin build with thread safety analysis."
am: 971e6585a6

Change-Id: I504a569348bcdbb3933cf8b5b1a793868feed035