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

Change-Id: I015cf8432c11a59b54dbcf6930bf948c319500e0