Merge pull request #268 from bhariharan/master

Point to the latest shared repo commit
Fix Build Issues with ADT 22