Merge "Put lockless-buffer in the correct folder & ensure local headers are picked...