Fix android dataset issue