fix misc android issues raised by testsuite