Merge "Enforce linker version-scripts are valid" am: e223965f0c
am: 33b4913adf

* commit '33b4913adf0e664fc63fbf366c78e9dff3bab170':
  Enforce linker version-scripts are valid