Merge "Add patches/clang.patch to fix two minor Clang compiler errors."