fix android deploy bugs