Merge "Fix opcode tests for sput_byte" into froyo