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

Change-Id: Ia6ec2f9836aac6b452cfa872e333bffbb403ba2f