Upgraded to newer support libraries, etc. Removed android-sdk dep, which seemed to break build.