Merge "Move to using full java-lib-files from stubs."