Merge "Track name change from adb_main to adb_server_main."