Pulled in in hardware/, where -Werror is used. Change-Id: I13fc31d31fe2f623d39c84862b0c95a28813723d (cherry picked from commit a32900deec)
a32900deec