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

Change-Id: I3f79d715c5eaa08b0d4e139fdb056efb24ad3d15