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

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