Merge "Remove -Wno-error." am: 789fb4401c
am: 21f4c41d30

Change-Id: I83228eb10733896e1e5ab1a3c62fb43eb34ce0c0