Merge "liblog: fix header guards ordering"