Merge "Use -Werror in frameworks/native/cmds" am: afee092bee am: f037948524
am: ea5bc92ba3

Change-Id: I9a3f0b5db423af1ec2925f0a0ca7307bda9b6f3a