Merge "Use -Werror in frameworks/base" am: 16fbd3a1d8
am: 0bfb717a37

Change-Id: I106827dd37a33cfcd956b2a1a3e48bd09576eadb