Merge "liblog: fix header guards ordering" into rvc-dev