Merge "Move adb_dirname and adb_basename to libbase" am: 5a8db38b01
am: e5dd37ec35

Change-Id: Iaca05587879d400f05cff297cd63aa56507492fc