Clean up tools.mk and updated prebuilt apps