Merge "Use -Werror in frameworks/av"