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

Change-Id: I4423f2838daac22baa172817254930c76685324b