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

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