cleanup android entry points
android implementation fixes