Merge "Fix FindFieldID to use class's classloader to find field type." into klp-dev