Merge "Insert a new `versionInfo` field into the `.rs.info` symbol" am: c29bfc44f2 am: b3284a20b9
am: 70925e3bf6

Change-Id: I9b386afd9d9b24f1a352519280125778495afa3d