Merge "Moving the JAVA_BINARY variable to be initialized properly" am: ba5d16a364

Original change: https://android-review.googlesource.com/c/platform/test/vts/+/1705974

Change-Id: I044779da2f1280e40863bea7069ac6ebb274b5dc