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

Change-Id: I2ad9578e5185253478dd28c5b9e24ba539149036