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

Change-Id: Ibfc63a029813ef952dc94f11baae7a96850e94d6