Merge "Add -Wno-error to compile with global -Werror."
am: 7516becc84

Change-Id: Iee0b622f5ca806655232812a1f26e0a587239eb6