Merge "adb: add basename_lock to mutex_list.h." am: f00db9d8b8
am: 148f362579

* commit '148f3625797fa989ea327521ef2e73b23709a80c':
  adb: add basename_lock to mutex_list.h.