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