Merge "Fixed and refactored 64b host build"