libbarrelfish: merging arch specific hearders for k1om and x86_64