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

Change-Id: Ie76322acc3b471da60a033cfa2474c1039d70339