Fixes for the Android UI code generator.