Merge "Use -Werror in external/elfutils" am: 86dd133095
am: 4842833de9

Change-Id: I59e96f33dc354dd8e6c16dc737a6f10e3c554388