Merge "Use -Werror in system/core/libpixelflinger" am: e3db2ab732
am: 9aedaa88e8

Change-Id: I0cb714e36470e618dcdb867461f64f823bba0ef3