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

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