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