Merged Ryans new makefiles for otapitest