Merge "Move atrace from the obsolete bzero to memset."