Merge "Move adb_dirname and adb_basename to libbase"