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

Change-Id: Icdd0221515247f0c1065de02ee880cc84ca60f52