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

Change-Id: I91d7f9aa783dd2341bdfb009552fcc8896e78ad7