Merge "Fix x86_64 build, clean up intermediate libraries."