Merge "Use -Werror in frameworks/base" am: a29836ad04 am: 267a2a8c8a
am: af60d7f8b5

Change-Id: I9daf24758eab254650dc0ea8809c56d0d536a641