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

Change-Id: I39dc7d41b88036dbee258bad2c085db545fbf472