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

Change-Id: I0d15f6d4a0340e846f87bbbf01236785db344a89