Merge "Move android_get_control_socket out of line" am: 4b5abcdba2 am: 4873829953 am: ea2b61c7a8
am: 8e3427fb04

Change-Id: I82ef9aeae182eccafb5aef710a450e2a877b4cd4