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

Change-Id: I42646866ac040da94b106b25baa94d20f81fc89d