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

Change-Id: I977320bc989a13a79d367ffd49d3f6b57c2ced10