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

* commit 'b2c3473d35d2fb8ea7bec9de290f7add979e5474':
  Just use snprintf for android_get_control_socket.