Merge "Track name change from adb_main to adb_server_main."
am: ee5c87eea7

* commit 'ee5c87eea737e47ab38e19625a32ac2fc0057ddd':
  Track name change from adb_main to adb_server_main.