Merge "Enable building spir binary"