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

Change-Id: Ib09e3690fe7b6bff6ccfe5893c41cfe828896e23