Merge "Fix opcode tests for sput" into froyo