Fix android build on Darwin.

This cleans up configure and Makefile.in so that things build correctly on Darwin.