Merge "linker: add test for zero shstrndx" am: 21482db6e1
am: 5a66605226

Change-Id: I39d88967048bd0ed388fa201362892ecf494b290