am 8826ba8a: am bc545e8a: Merge "Fix x86_64 build, clean up intermediate libraries."

* commit '8826ba8ab6922927bdac2466d2903916d5806a06':
  Fix x86_64 build, clean up intermediate libraries.