Merge "Add UnixChannelFactory to preloaded-classes" am: 7f26443fac am: 1b49e036c0

Change-Id: Ia59f1348f10182c8149a25abc935735a629a5b8f