Merge "Fix opcode tests for sput_wide" into froyo