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

Change-Id: Ib27445c71318d6aa11cf99b48aeb180529d7e11a