Merge "system_server BINDER_TYPE_FD sockets using ashmem accessors" am: cf9944684f
am: becad77245

* commit 'becad77245e5549600e996b287ad47e8c0edcd46':
  system_server BINDER_TYPE_FD sockets using ashmem accessors