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

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