Fix unit test / fix build for android