Merge "pass -W to readelf to avoid splitting lines" am: c984600216 am: 2181b5e74e
am: 1ea5a96e30

Change-Id: If922aae80389193645df8172b5a9953c6127514d