Merge "Use default strip options for libjavacoretests"