Fix Build Issues with ADT 22
Merge pull request #314 from bhariharan/master

Fix Build Issues with ADT 22