Revert "Revert "Revert some flaky unloading""

Still some issues with 136-daemon-jni-shutdown

bug:28406866

This reverts commit 9e726e874580f1e8b2e0bfa63d2e9a3ac911cd1c.

Change-Id: I76e7ba47e30cf97ecd074d5c2aff41cda8edac59
2 files changed