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

Change-Id: I8081da50e70ea3856356e455a8fdec8abf74011d