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

* commit '396f6b7771688c5aeb72138fff4d9415e31ae1da':
  Eliminate text relocations in x86 optimized memset versions