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

Change-Id: I1878de4a1cdcbd3099c9f1ad877184595fc17750