Merge "Use -Werror in bootable/recovery" am: 88aa128e22
am: b5437e3e1b

Change-Id: I4ce078f45cc91dc0e868611dd5913b375a029be7