Make javac vm-tests-tf match jack am: dbb391fb92 am: e20a59f0be
am: da8aceba47

Change-Id: Ic57df8041b7a406ebf39cb467021971e2d27b4cf