android testsuite fixes