Merge "adb: fix adb_close() vs. unix_close() usage"