Merge "adb: don't hardcode ports in test_adb." am: cb57583949

Change-Id: I41729dfa1d671da480280b76be0200eac355560f