am 581f4305: am 76ef331c: am 7e7d6c48: use local symbols in memset so it doesn\'t screw up profiling

Merge commit '581f43056b594429b3df4678d87989c93d8f81d2'

* commit '581f43056b594429b3df4678d87989c93d8f81d2':
  use local symbols in memset so it doesn't screw up profiling