More work on Android support; debug code active.