Merge "Remove liblog/uio.c and <log/uio.h>"
am: 771acec6ca

Change-Id: Iee8f6d1c3d3111b890e22241b255ca1e74d58a02