More Fixes for ADT 22 to Prevent NoClassDefFoundError
Merge pull request #316 from bhariharan/master

More Fixes for ADT 22 to Prevent NoClassDefFoundError