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

Change-Id: Iea1ce7e3832d7cd3151c114a98f79c7d7a9160fd