am 4974879c: Merge "Switch target java library dependency file from...
am 4974879c: Merge "Switch target java library dependency file from javalib.jar to classes.jar" into jb-mr2-dev
* commit '4974879c':
Switch target java library dependency file from javalib.jar to classes.jar