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

Change-Id: I6d6a48bf88fe598961bd3b3a7a05aa496f286ea1