Finish cleanup from server merge. Added Android File Transfer.