Merge "Move ART_HOST_TEST_DIR to Android.common_test.mk"