Merge "Support socket activation of adb server" am: b14c37fc6b am: 72d63f9ce9
am: aafd634afd

Change-Id: I68de4c62d9489b4174eca66d8dcd6ee6b9fb3521