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

Fix Build Issues with ADT 22
Merge branch 'master' into unstable20
Merge pull request #315 from bhariharan/unstable20

Merge branch 'master' into unstable20
Merge from upstream