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

Change-Id: I469dfae330eb314556327b2e7681c885883f00b8