Merge "Support socket activation of adb server"
am: b14c37fc6b

Change-Id: I169437297c8fc648c7dfe628d28cea56ac5cea4b