Merge "Use -Werror in system/extras" am: 560b2196d5
am: 954d9ce3e7

Change-Id: I37dbe88c991c3c3b475fba33a29c9bc66c511aed