Merge "Fix SANITIZE_TARGET build of liblog."