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

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