Merge "Remove liblog/uio.c and <log/uio.h>"