Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES." into jb-mr1-dev