Merge "Fix opcode tests for sput_short" into froyo