[android] Essential fixes in safe wrappers
Merge branch 'android-client-safe-wrappers'