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

Change-Id: I0c5e3ccdba1df55ae87ec32a7b88a0b499cebd09