Merge "Use -Werror in frameworks/native/services"
am: 9099430db7

Change-Id: Ie78c969b161e538661481ac69a4e135fd8f5b90a