Merge "pass -W to readelf to avoid splitting lines"
am: c984600216

Change-Id: I27d7fb4fa1d3e9a6084d7dd5e0cd3529251ab21d