Revert "Fixed a native library class reload issue in the diagram submodule"

This reverts commit 4d0b3f9b35f4db60fce7d1921212739da9d09287.
Merge branch 'master' into parenthesis