Merge "Remove obsolete Makefile used for host testing"