Merge "Clean-up makefiles for test applications."