Merge "Use kotlinx-metadata-jvm instead of kotlin-metadata" am: 39eea3b7ca am: baa41310f6

Change-Id: Ia1382b886bff77f09321fcdebb4be59470346371