am 88cc0ade: am eda16b98: Merge "Kill LOCAL_SOCKET_NAMESPACE."

* commit '88cc0aded69e06d140a82064355509cac2c3cbfb':
  Kill LOCAL_SOCKET_NAMESPACE.