Merge "Use -Werror in development"
am: 14b2eeb009

Change-Id: Iaf0beadcc9cbf60facc26a3003f8bb2d836be30b