am a85a5ba9: am b6b40079: adb: Clean up argument passing for create_service_thread()

Merge commit 'a85a5ba9fdfb7f31f8580a71c4f95313d9236884'

* commit 'a85a5ba9fdfb7f31f8580a71c4f95313d9236884':
  adb: Clean up argument passing for create_service_thread()