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

Change-Id: I3a1a29fb8b0c433d43bb8811b522673e5be5ece6