Fix android build errors