Merge "Use -Werror in frameworks/native/cmds/cmd"
am: 68686bd151

Change-Id: I690f234edece16c44c359c9aefbe1dc2c7494846