Merge "Use -Werror in frameworks/base/media/mca/filterfw" am: 171fce8377 am: cba4979a6a
am: f5005c6356

Change-Id: Icb467de821ecd700daae687341dc9116c065cdf5