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

Change-Id: I698ee4b4d6c884469253238795d23bdb21a54542