8161985: Spurious override of Object.getClass leads to NPE
Summary: Attr.adjustMethodReturnType() tweaks return types w/o checking what method is being patched
Reviewed-by: vromero