Fix some warnings generated by gcc 4.8 and clang

No really major ones.  Android clang builds but doesn't link, probably libc++ or something but didn't really look into it.

-[Unknown]