Merge "Allow adb to listen both on usb and tcp." into jb-mr1-dev