Merge "Fix Class.getDeclaringClass bug"