fix android build
fix windows merge error