AndroidLib Fixes and Changes