Merge "Use -Werror in system/extras/tests"