Merge "Fix samples for 64-bit ABIs"