Merge "CTS: Use a common base Makefile for JVMTI host tests"