Merge "Use -Werror in frameworks/native/cmds/cmd" am: 68686bd151 am: 72a9a36235
am: 6459c5bc0d  -s ours

Change-Id: I3cb93ab5e8483f041ec801cc31f087f458da4192