Merge "Use -Werror in system/core" am: 4ef714eae0 am: 57270f809a
am: 6e28ff2ce6

Change-Id: I4549365b266f536fb076dd637d1e3259e27d73b9