Merge "Add -Wno-error to compile with global -Werror."
am: 78628913ee

Change-Id: Idce1c0da267017db9d2f8dba402c84175da91017