Merge "Remove redundant Wno-error."
am: b09dcb15d5

Change-Id: I12a721bf52956e88f77e1f0e6e757c5bdab29dc3