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

Change-Id: I121992a0a1426ea5a94c083d28c1933e55256003