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

Change-Id: I169437297c8fc648c7dfe628d28cea56ac5cea4b