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

Change-Id: If65473d6117b67a4e2c0b5e359e3a6820d6e5c5e