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

Change-Id: Ia19db1eb946af8b15277f1b8591bc63407db0485