Merge "Label /dev/socket/zygote_secondary"