Merge "Make the tests that call readelf(1) less sensitive to whitespace."