Merge "Add option to parse version script during linking." am: 2802d06252
am: d9dada5696

Change-Id: Iaf7e441f41d39b120fbcaf8c890f2cf71942efd7