Merge "build native tests for 32-bit and 64-bit"