Merge "Move android_get_control_socket out of line"
am: 4b5abcdba2

Change-Id: If427dfca41a23d94f2f026edbeb0dc8cd73a4724