Merge "Add -Wno-error to compile with global -Werror." am: dae62bdf70 am: 5f32ca93b0
am: 8cc1ab3e0e

Change-Id: Ifbe2850b87bddebc674b8b53e497597c31bcf9fc