Merge "Use -Werror in external/libcap-ng" am: c5a85815e2 am: 68b050049c
am: 5e45fbcb70

Change-Id: I77df327e682daefae52ebd4874053a43c4a62692