Merge "Fix compiler warnings in sonivox and enable -Werror." am: 8b683e6c38 am: 724ffdd9cd
am: 55703997eb

* commit '55703997eb2d3522f8871a2fe8baa3ff1d2bb527':
  Fix compiler warnings in sonivox and enable -Werror.

Change-Id: I693b89317cbf219be2118dc8bf96ec6c64126eff