Merge "Fix opcode tests for sput_char" into froyo