Android CTS 7.1 Release 20 (4892579)
Merge "sonivox: -Wno-unused-parameter." am: 825ad522d5
am: d3bd739763

* commit 'd3bd739763e90807ca36b264972a6fafeecc6ef3':
  sonivox: -Wno-unused-parameter.