Merge "Prefer libbase static library dependency for libjavacoretests"