Merge "Remove useless arguments from is_adb_interface." am: bd6c6eb0e4 am: db50d1d6ef am: 0a629b4bdd
am: f369babcb8

Change-Id: Ia4bc1098f268ed09cfd937728d46337e1525f84d