Android & Linux builds and a few cleanups & fixes.