Minor fixes to Makefile generation related to the FFI, and Android