Revert "fix NoClassDefFoundError"

This reverts commit bf392a9d0ba02f936aa2f3ffb27892c8c2de6727.

Change-Id: I511de97363d1ea6434b84156d8119a4372aeb312
Merge "Revert "fix NoClassDefFoundError"" into jellybean42