I know there's some activity in the Android subsystem so maybe it would be a good time to fix that (pretty please?)