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

* commit '631841804f0326b227acdd7cfb1ff36ecc76981d':
  Clean up the makefile to build android.core.vm-tests-tf.jar.