Merge "Use -Werror in external/tremolo" am: 060dc15e07 am: ac70b75ffc am: 3b475c0092
am: f59890bf8b

Change-Id: Ib3c302212bae2475ed450b37cf0f8705350f19d9