Merge "Use -Werror in frameworks/native/cmds" am: ea6c6b9f85 am: f27645c993
am: 0c328734f5

Change-Id: I75c23bf84de1158e9c3105f23c18c33251552bac