Merge "Fix opcode tests for sget_*" into froyo