* More work on Android port