Merge "libjavacoretests: clean up dependencies."