armani: cleanup
Revert "Increase handset speaker gain"