am 70df6f85: Merge "Just use snprintf for android_get_control_socket."

* commit '70df6f85fe8164010be3e4e1cf87e1dd31fb7614':
  Just use snprintf for android_get_control_socket.