AndroidLib Fixes and Changes

Had to make sure I was up to date with what you have posted to github, sorry.