am 5bb67760: am f6afd3b6: Merge "Fix x86 build, remove void* arithmetic."

# Via Android Git Automerger (1) and others
* commit '5bb67760f0baddd815334bf87be79f0e7fd9fafe':
  Fix x86 build, remove void* arithmetic.