Os: add GetControlSocket() am: a5bb08c1cf am: 8057c92c09
am: 34f9d3bf60

Change-Id: Ia81c6fc42424fbf4038889d186f1395053bdbb76