Merge "Remove liblog/uio.c and <log/uio.h>" am: e181bf5116 am: 788fbbb857
am: 52e4c6919f

Change-Id: I05978fc154274c5b13a7fa6b8eeb6b62ace2914a