581f43056b
Merge commit '76ef331cd6967ca8f5af779d25c8b634f8cdd2b6' into eclair-mr2-plus-aosp * commit '76ef331cd6967ca8f5af779d25c8b634f8cdd2b6': use local symbols in memset so it doesn't screw up profiling