[android] Essential fixes in safe wrappers