Merge "Update to kotlinx-metadata-jvm 0.4.0 so that dagger2 can read 1.7.0 kotlin metadata"