Merge "Switch target java library dependency file from javalib.jar to classes.jar" into jb-mr2-dev