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

Change-Id: I4939be7a90acf307ffd8bfb57d512b5f7f7aa490