Merge "Update the Android makefile to include most C files."