am 4d87e743: Merge "Eliminate text relocations in x86 optimized memset versions"

* commit '4d87e743083c201edd0b565dd7d42e70945a6265':
  Eliminate text relocations in x86 optimized memset versions