Merge "Use -Werror in system/extras/tests"
am: 0bc040a8cb

Change-Id: I3a586b26e4b59f469fb265f7649f4303f0e0b6d7