Merge "Use -Werror in bionic" am: 9385d778fd
am: 7887421aed

Change-Id: I85025e8bfb7d0dc91a064079782ec5a0bf7783a2