Merge "javalib.jar -> classes.jar for the stubs included in SDK"