am d0faf5a2: am c6d7a895: Merge "Changed type of reverb presets from int to short" into gingerbread

Merge commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05'

* commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05':
  Changed type of reverb presets from int to short