am ceddc751: resolved conflicts for merge of 63e70b24 to honeycomb-plus-aosp

* commit 'ceddc751d7a2764da56a573de83202f30843c45b':
  Permit 0 length writes.
  Let SocketClient users write binary data to clients.