Merge "Use -Werror in frameworks/native/services/inputflinger" am: 4d6bb5a8b0
am: d1e64c72ca

Change-Id: I227a8dea87e0caaf8efcdcf21a7c6ee736504e62