Merge \"Allow multiple (sequential) adb users on Linux.\"
am: 6bf8d26c82

Change-Id: I76e75478b738a2452db33faa4ab68844acb9415a