Merge pull request #310 from bhariharan/unstable20

Latest shared repo commit
Fix Build Issues with ADT 22.0