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

Change-Id: I4792be67f2a33c61f0e740ba9093c06df4613921