Merge "Revert "Revert "Support socket activation of adb server"""
am: a449a1cfd7

Change-Id: If741b0798e242b8d06eb4bf6dbdb0d059c134306