Fix Clang build.

This contains a new Android-specific patch to fix the Chromium
linux Clang builds.

This updates patches/channelid.patch independently since this
patch hasn't been submitted upstream yet.

Change-Id: I9d9a2ca3ad8446a54db5a023571fde1bc0d276c5
diff --git a/ssl/s3_both.c b/ssl/s3_both.c
index 514ff85..1edef20 100644
--- a/ssl/s3_both.c
+++ b/ssl/s3_both.c
@@ -555,7 +555,7 @@
 #endif
 
 	/* Feed this message into MAC computation. */
-	if (*s->init_buf->data != SSL3_MT_ENCRYPTED_EXTENSIONS)
+	if (*(unsigned char*)s->init_buf->data != SSL3_MT_ENCRYPTED_EXTENSIONS)
 		ssl3_finish_mac(s, (unsigned char *)s->init_buf->data, s->init_num + 4);
 	if (s->msg_callback)
 		s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, s->init_buf->data, (size_t)s->init_num + 4, s, s->msg_callback_arg);