Fix bluetooth headphones audio and cleanup

Change-Id: Ibd71ed4721d28f8921ab3dd2007e2027ef793157