Merge "Insert a new `versionInfo` field into the `.rs.info` symbol" into oc-dev
am: 3cfa6a0673

Change-Id: I1fd1000b45e9e21b008f57bc25a3673880fe069e