Merge pull request #314 from bhariharan/master

Fix Build Issues with ADT 22
More Fixes for ADT 22 to Prevent NoClassDefFoundError