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

Change-Id: I04f10d5d80f6ca8c58ad5ba609b95ba98507b250