Merge "minadbd: rename adb_server_main to minadbd_main."
am: 818394869d

Change-Id: I7a8fe351a8bfa0b7bdc48c89d56647a98018af51