Fix android compile errors