Merge "Use -Werror in hardware/interfaces" am: 85bb01dd6b
am: 3ed04cd35d

Change-Id: I66c74139be9c7736beb354b5da0381668f4e68c5