Merge "Use -Werror in hardware/libhardware" am: d1a2b9f7c1
am: d67dcc5fc8

Change-Id: Id15a9a3ae5769ddd6a143691de98e80eb72e06a8