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

Change-Id: I72bf81976dfca3d4868c5428f02f7cc6038a4b86