Fix mismerge for linaro