Merge "Use -Werror in frameworks/native/libs/binder" am: 7c87059845
am: 6e3d16b708

Change-Id: I838d644e2a6528d43726803d92661b657bea1047