Clang fixes to earlier changes and build compatability with Google environment part 2
Clang fixes to earlier changes and build compatability with Google environment part 2

UB-Mannheim/tesseract,tesseract-ocr/tesseract,stweil/tesseract,jbarlow83/tesseract,amitdo/tesseract,UB-Mannheim/tesseract,jbarlow83/tesseract,stweil/tesseract,jbarlow83/tesseract,UB-Mannheim/tesseract,amitdo/tesseract,stweil/tesseract,jbarlow83/tesseract,amitdo/tesseract,tesseract-ocr/tesseract,tesseract-ocr/tesseract,tesseract-ocr/tesseract,stweil/tesseract,stweil/tesseract,amitdo/tesseract,tesseract-ocr/tesseract,amitdo/tesseract,UB-Mannheim/tesseract,jbarlow83/tesseract,UB-Mannheim/tesseract