Merge "Clean up the makefile to build android.core.vm-tests-tf.jar."