Merge "adb: decrease the number of fds used in fd_count test."