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

Change-Id: Icb8574c2f32ec41a126e550bcac7c63a03487ae2