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

Change-Id: I68de4c62d9489b4174eca66d8dcd6ee6b9fb3521