Fix Build Issues with ADT 22.0
Merge pull request #311 from bhariharan/unstable20

Fix Build Issues with ADT 22.0
Merge from upstream