Fix some warnings generated by gcc 4.8 and clang

From the new NDK.  No really major ones.  Android clang builds but doesn't link, probably libc++ or something but didn't really look into it.

Oops, may overlap with #2942.

-[Unknown]