Merge "Use -Werror in frameworks/av" am: cf8437acd9 am: d9c907b8fd
am: 11ebad3460

Change-Id: I73d01bf0a10d55ce7cf5c76e4a21533565e81f0e