Merge "Use -Werror in hardware/interfaces/dumpstate/1.0/default" am: 641fc32fc0
am: fc67ecce2a

Change-Id: I06fd7575eb39973e91c4ca4f726275bc05c0d703