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

Change-Id: I772102fb153191bbb0fb47e7b73673d0822a47d1