Merge "Use -Werror in system/extras"
am: 2b217ca555

Change-Id: I2b450737e818ec11aa6c4c73afe76c5e515afb59