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

Change-Id: I332f5517797fb2a3919c4d2911fd9eff93df6a46