Merge "liblog: Build Breakage in sdk(linux)"